Various strictDeps and cross fixes#142602
Merged
SuperSandro2000 merged 27 commits intoNixOS:stagingfrom Nov 5, 2021
Merged
Conversation
Artturin
force-pushed
the
strictdepsfixes
branch
2 times, most recently
from
7f7bf79 to
893afb1
Compare
ofborg
bot
added
10.rebuild-darwin-stdenv
ofborg
bot
added
10.rebuild-darwin: 501+
Artturin
commented
Oct 22, 2021
ofborg
bot
requested review from
Phreedom,
edolstra,
joachifm,
ju1m,
lovek323,
np and
thoughtpolice
Artturin
added
the
6.topic: cross-compilation
github-actions
bot
added
the
6.topic: python
Artturin
force-pushed
the
strictdepsfixes
branch
from
d69c368 to
8b38aa9
Compare
Member
Author
|
with these changes im able to compile everything up to diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 8fa30637049..cc21b152c12 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -69,7 +69,7 @@ in
, doInstallCheck ? config.doCheckByDefault or false
, # TODO(@Ericson2314): Make always true and remove
- strictDeps ? stdenv.hostPlatform != stdenv.buildPlatform
+ strictDeps ? true
, meta ? {}
, passthru ? {}
, pos ? # position used in error messages and for meta.position
@@ -310,7 +310,7 @@ else let
llvm-config = 'llvm-config-native'
'';
in [ "--cross-file=${crossFile}" ] ++ mesonFlags;
- } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {
+ } // lib.optionalAttrs (attrs.enableParallelBuilding or true) {
enableParallelChecking = attrs.enableParallelChecking or true;
} // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) {
NIX_HARDENING_ENABLE = enabledHardeningOptions;dependency tree: https://gist.github.com/Artturin/d63a9007774f7cb7994a93acdfb69899 |
Member
Author
|
Weird, with |
12 tasks
Member
Author
|
with this PR sway successfully cross-compiles @Mindavi |
Artturin
force-pushed
the
strictdepsfixes
branch
4 times, most recently
from
869e506 to
a9a4de5
Compare
Member
Author
* with aarch64-linux binfmt |
Artturin
force-pushed
the
strictdepsfixes
branch
from
a9a4de5 to
673a491
Compare
checked output with diffoscope libnotify: make gobject-introspection conditional to fix binfmt cross-compile
checked with diffoscope
pango: fix binfmt cross-compile
neither gentoo or arch list them checked with diffoscope and there were no changes
output checked with diffoscope
there are no tests
libgudev: make gobject-introspection conditional to fix binfmt cross-compile
librsvg-aarch64-unknown-linux-gnu> error: linker `cc` not found librsvg-aarch64-unknown-linux-gnu> | librsvg-aarch64-unknown-linux-gnu> = note: No such file or directory (os error 2) librsvg-aarch64-unknown-linux-gnu> error: could not compile `librsvg` due to previous error librsvg-aarch64-unknown-linux-gnu> make[2]: *** [Makefile:1572: /build/librsvg-2.52.0/target/aarch64-unknown-linux-gnu/release/rsvg-convert] Error 101
adding python3 to nativeBuildInputs is not enough as it still uses the aarch64 python for the build
zlib has to be in nativeBuildInputs too because its run during the build, i think.
Artturin
force-pushed
the
strictdepsfixes
branch
from
11c6bad to
04e17c1
Compare
Member
Author
yes but i'd like to do that in a separate pr after this is merged |
Member
|
I looked through every file and didn't see any obvious code smell. If anything major breaks we will notice it in the staging cycle. Here goes nothing. |
13 tasks
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)